]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
workspace: Use has_pointer() method instead of property
authorFlorian Müllner <fmuellner@gnome.org>
Wed, 19 Jul 2017 00:43:25 +0000 (02:43 +0200)
committerFlorian Müllner <fmuellner@gnome.org>
Wed, 19 Jul 2017 08:49:54 +0000 (10:49 +0200)
ClutterActor has both a has_pointer() method and a :has-pointer
property (that we represent as 'has_pointer'). So far gjs was
able to deal with the name overlap, but now trying to use the
property will instead test for the availability of the method.
Just avoid the conflict by switching to the method, which is
unambiguous.

https://bugzilla.gnome.org/show_bug.cgi?id=785090

js/ui/workspace.js

index 035a6b57286ec64c7aa82435e104a8016fc6c5b2..ff2618a516c97fbffce56972bc70dcf97bc9f4bc 100644 (file)
@@ -500,7 +500,7 @@ var WindowOverlay = new Lang.Class({
         this._hidden = false;
 
         this.title.show();
-        if (this._windowClone.actor.has_pointer)
+        if (this._windowClone.actor.has_pointer())
             this._animateVisible();
     },
 
@@ -699,8 +699,8 @@ var WindowOverlay = new Lang.Class({
     _idleToggleCloseButton: function() {
         this._idleToggleCloseId = 0;
 
-        if (!this._windowClone.actor.has_pointer &&
-            !this.closeButton.has_pointer)
+        if (!this._windowClone.actor.has_pointer() &&
+            !this.closeButton.has_pointer())
             this._animateInvisible();
 
         return GLib.SOURCE_REMOVE;